Merge git://git.denx.de/u-boot-x86
authorTom Rini <[email protected]>
Sat, 7 Oct 2017 13:12:04 +0000 (09:12 -0400)
committerTom Rini <[email protected]>
Sat, 7 Oct 2017 13:12:04 +0000 (09:12 -0400)

Trivial merge